Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 1 Dec 2011 17:26:48 +0000 (17:26 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 1 Dec 2011 17:26:48 +0000 (17:26 +0000)

Trivial merge